Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Driver/mercuryips dev #831

Closed
wants to merge 361 commits into from
Closed

Driver/mercuryips dev #831

wants to merge 361 commits into from

Conversation

nataliejpg
Copy link
Contributor

Fixes #issuenumber.

Changes proposed in this pull request:

@mention one core developer

nataliejpg and others added 30 commits February 8, 2017 11:21
@nataliejpg
complete rec_samp and buf_rec controllers and change post processing …
d8cae49 
…reshape logic in others
@nataliejpg
updating notebook to reflect driver changes, nb untested on an alazar
1f4ea7e
@jenshnielsen
Revert "Change lower limit of freq allowed to 1 MHz"
c00d8cd 
This is a non related change. Will go in on a different pr
This reverts commit e8190ec.
@jenshnielsen
Fix: remove conflict leftover
72cbaf4
@jenshnielsen
Fix: sync AWG example notebook with master
91c1f43
@jenshnielsen
Merge remote-tracking branch 'origin/master' into ATS9360
4afbfe3
@jenshnielsen
Fix mock scipy for docs build
c627937
@jenshnielsen
Fix: correct rst syntax ATS9360
e851987
@jenshnielsen
fix: acq_helpers correct doc syntax
42ea288
@jenshnielsen
fix: rst syntax in basic controller
bf2a211
@jenshnielsen
fix ATS.py cleanup rts syntax
f91f4bf
@jenshnielsen
fix ATS9870 improve rts syntax
2d00dcf
@jenshnielsen
Fix: Ats controllers fix rst
b8e3a2c
@jenshnielsen
Fix: SampleSweep to multiparamter
b89071f
@jenshnielsen
Fix: AveragedAcqParam to multiparameter
27b6341
@jenshnielsen
Fix: BuffersRecordsAcqParam to multiparameter
1282036
@jenshnielsen
Fix: RecordsSamplesAcqParam to MultiParameter
58291b3
@jenshnielsen
Fix: RecordsAcqParam to Multiparameter
fcd9a77
@jenshnielsen
Fix: SamplesAcqParam -> MultiParameter
718531e
@giulioungaretti
feature: Use unit in label
dfd48ab
@jenshnielsen
fix: typos spotted reading the code
cd2c75b
@jenshnielsen
Fix: deduplicate parameter
bfaa86c
@jenshnielsen
fix: more parameter refactoring
9d606ca
@jenshnielsen
Fix: more deduplication
bff5ba1
@jenshnielsen
Fix: more deduplication
91e9e82
@jenshnielsen
Fix: add 2d and 3d parameters
32521aa
@jenshnielsen
use generalised parameters
b27b448
@jenshnielsen
Pep8
55c750f
@jenshnielsen
Fix: no need to use setattr here
e2b96f2 
It confuses linters
@jenshnielsen
Fix: pep8
c6b257f
nataliejpg and others added 26 commits August 30, 2017 09:05
@nataliejpg
add DS_Store to gitignore
438e68a
@nataliejpg
sort natalie_wrappers so they work and test with transmon_wrappers
65033ea
@nataliejpg
check functions match originals everywhere, delete originals in wrapp…
b2c9429 
…ers.py and put new versions in init
@nataliejpg
add missing imports
dcc5c7b
@cQED-T3
add missing imports to sweep_functions wrapper
8ebdd47
@cQED-T3
add plot_x_position to global dictionary in my init function so that …
f4289e9 
…it plays nicely with plotting wrappers
@nataliejpg
add atexit close station to basic init of wrappers
b260b21
@nataliejpg
add do0d to wrappers and edit measure.py to behave more like loop for…
514772e 
… wrapper function use
@nataliejpg
make show_num_do plotting optional
8746109
@nataliejpg
device annotator into wrappers folder
828cc67
@nataliejpg
configreader into wrappers folder and expose sections function in Con…
5c58141 
…fig class
@nataliejpg
device image import updated
d046d2a
@nataliejpg
monitor into wrapper functions
124dad6
@nataliejpg
delete monitor, configreader amd device annotator from utils as they …
778f41c 
…now live in wrappers folder
@cQED-T3
merge in driver/ATS9360 and resolve merge conflicts
e3e5bb7
@nataliejpg
small bug fixes due to monitor moving to wrappers and small changes t…
4c02d42 
…o configreader
@nataliejpg
remove wrappers from qcodes as they now live in their own repo
5b11134
@cQED-T3
merge conflicts resolved
9f387b9
@cQED-T3
beginnings of vna driver extension to get spectroscopy mode working
13024e0
@cQED-T3
merge in ZNB_dev updates
4b00eed
@cQED-T3
debug spec mode on ZNB
059aefa
@cQED-T3
set_parser for seq element setting added
a80cafe
@cQED-T3
measuting with ZNB
9b92b25
@cQED-T3
T3 edits to fine mode of decadac
bc775d5
@cQED-T3
Merge branch 'driver/AWG5014_dev' into refactoring/init
da0d173
@cQED-T3
change default hold_after_set to True
f4ed824
@jenshnielsen jenshnielsen mentioned this pull request Oct 31, 2017
Merged
@jenshnielsen
Copy link
Collaborator

Replaced by #835

@nataliejpg nataliejpg deleted the driver/mercuryips_dev branch December 10, 2018 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nataliejpg @jenshnielsen @giulioungaretti @WilliamHPNielsen @cQED-T3